Skip to content

Wait for the robot to report the puck/pin value instead of just waiting for beamline enable flag#1951

Merged
rtuck99 merged 4 commits intomainfrom
1950_wait_for_puck_and_pin
Mar 18, 2026
Merged

Wait for the robot to report the puck/pin value instead of just waiting for beamline enable flag#1951
rtuck99 merged 4 commits intomainfrom
1950_wait_for_puck_and_pin

Conversation

@rtuck99
Copy link
Contributor

@rtuck99 rtuck99 commented Mar 2, 2026

Fixes #1950

Instructions to reviewer on how to test:

  1. Tests pass
  2. Robot load does not proceed until the correct puck and pin are reported

Checks for reviewer

  • Would the PR title make sense to a scientist on a set of release notes
  • If a new device has been added does it follow the standards
  • If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
  • Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

@rtuck99 rtuck99 marked this pull request as ready for review March 2, 2026 17:42
@rtuck99 rtuck99 requested a review from a team as a code owner March 2, 2026 17:42
@rtuck99 rtuck99 force-pushed the 1950_wait_for_puck_and_pin branch from f255836 to 4b80415 Compare March 2, 2026 17:43
@codecov
Copy link

codecov bot commented Mar 2, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 99.10%. Comparing base (e0e8710) to head (ed62f9a).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1951   +/-   ##
=======================================
  Coverage   99.10%   99.10%           
=======================================
  Files         319      319           
  Lines       12230    12242   +12     
=======================================
+ Hits        12121    12133   +12     
  Misses        109      109           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@rtuck99 rtuck99 force-pushed the 1950_wait_for_puck_and_pin branch from 4b80415 to 33812f7 Compare March 10, 2026 14:16
@rtuck99 rtuck99 changed the title Initial fix for not waiting for puck/pin value Wait for the robot to report the puck/pin value instead of just waiting for beamline enable flag Mar 11, 2026
Copy link
Contributor

@jacob720 jacob720 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just one comment

_enable_beamline_and_update_pin,
_beamline_disable,
)
# set_mock_value(bart_robot.beamline_disabled, BeamlineStatus.ENABLED.value)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this comment be here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will remove it, when we pick up the log message the side effect is now what enables the beamline

@rtuck99 rtuck99 enabled auto-merge (squash) March 18, 2026 11:37
@rtuck99 rtuck99 merged commit 4d732f7 into main Mar 18, 2026
7 checks passed
@rtuck99 rtuck99 deleted the 1950_wait_for_puck_and_pin branch March 18, 2026 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Robot load reported success when it actually failed

2 participants